Here's the patch for making the otherend_changed entrypoint

optional.  The USB driver doesn't need this entrypoint because the state
machine driven by it is factored out of the driver code entirely into
xenidc.

Signed-off-by: Harry Butterworth butterwo@uk.ibm.com

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index fd49ca898f4bd8f2c799e237f4658a3e2c86651e..56ac2505b7de1668cfb69830be6123f9e271d57e 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -299,8 +299,8 @@ static void otherend_changed(struct xenbus_watch *watch,
 
        DPRINTK("state is %d, %s, %s",
                state, dev->otherend_watch.node, vec[XS_WATCH_PATH]);
-
-       drv->otherend_changed(dev, state);
+       if (drv->otherend_changed)
+               drv->otherend_changed(dev, state);
 }